From 24a6ed484bf95f363a52b226e1edcd775eef1812 Mon Sep 17 00:00:00 2001 From: Brendan Cully Date: Wed, 13 Dec 2006 17:45:50 -0800 Subject: [PATCH] Improve XendCheckpoint's forkHelper error handling. When inputHandler raises an exception, close stdin and stdout in the child before attempting to close stderr, which is held open by a separate thread. Without this patch, exceptions raised by device migration caused xend to hang on child.childerr.close(). Signed-off-by: Brendan Cully --- tools/python/xen/xend/XendCheckpoint.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tools/python/xen/xend/XendCheckpoint.py b/tools/python/xen/xend/XendCheckpoint.py index 21a323cdcc..85a59e5d22 100644 --- a/tools/python/xen/xend/XendCheckpoint.py +++ b/tools/python/xen/xend/XendCheckpoint.py @@ -218,18 +218,17 @@ def forkHelper(cmd, fd, inputHandler, closeToChild): log.debug('%s', line) inputHandler(line, child.tochild) - thread.join() - except IOError, exn: raise XendError('Error reading from child process for %s: %s' % (cmd, exn)) finally: child.fromchild.close() - child.childerr.close() if not closeToChild: child.tochild.close() + thread.join() + child.childerr.close() + status = child.wait() - status = child.wait() if status >> 8 == 127: raise XendError("%s failed: popen failed" % string.join(cmd)) elif status != 0: -- 2.30.2